From 9a2c000b19c67144e59530024b5c2e8e2a7d7d3c Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Mon, 17 Jun 2019 11:18:26 -0600
Subject: [PATCH] roll Qt to 5.12.4. (#369)

---
 .travis.yml           | 4 ++--
 tools/Dockerfile_qtio | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 47b910988..fbfa53a9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,7 @@ matrix:
         timeout: 600
     - os: osx
       compiler: clang
-      env: QT_VERSION="5.12.3"
+      env: QT_VERSION="5.12.4"
       cache:
         directories:
           - $HOME/Cache
@@ -94,7 +94,7 @@ script:
 after_success:
   - cd ${TRAVIS_BUILD_DIR}
   # only deploy pushes to master or prs that target master.  the prs will go to transfr.sh, the pushes go to github.
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ] &&  [ "${QT_VERSION}" = "5.12.3" ] && [ "$TRAVIS_BRANCH" = "master" ]; then bash ./tools/uploadtool/upload.sh  gui/GPSBabel-*.dmg; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ] &&  [ "${QT_VERSION}" = "5.12.4" ] && [ "$TRAVIS_BRANCH" = "master" ]; then bash ./tools/uploadtool/upload.sh  gui/GPSBabel-*.dmg; fi
 
 branches:
   except:
diff --git a/tools/Dockerfile_qtio b/tools/Dockerfile_qtio
index 6cb34ce57..1fbd89524 100644
--- a/tools/Dockerfile_qtio
+++ b/tools/Dockerfile_qtio
@@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # basic build and test tools
 COPY ./qtci/install-qt ./qtci/extract-qt-installer /app/
-RUN QT_CI_PACKAGES=qt.qt5.5123.gcc_64,qt.qt5.5123.qtwebengine QT_CI_DOWNLOADER="wget -nv -c" PATH=/app:${PATH} ./install-qt 5.12.3 /opt
+RUN QT_CI_PACKAGES=qt.qt5.5124.gcc_64,qt.qt5.5124.qtwebengine QT_CI_DOWNLOADER="wget -nv -c" PATH=/app:${PATH} ./install-qt 5.12.4 /opt
 
 FROM ubuntu:bionic
 LABEL maintainer="https://github.com/tsteven4"
@@ -83,8 +83,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  && rm -rf /var/lib/apt/lists/*
 
 # Qt
-COPY --from=qt_install /opt/qt-5.12.3.env /opt/qtio.env
-COPY --from=qt_install /opt/Qt/5.12.3 /opt/Qt/5.12.3
+COPY --from=qt_install /opt/qt-5.12.4.env /opt/qtio.env
+COPY --from=qt_install /opt/Qt/5.12.4 /opt/Qt/5.12.4
 COPY --from=qt_install /opt/Qt/Licenses /opt/Qt/Licenses
 
 # pkgs needed to generate coverage report:
-- 
2.30.2